From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sat, 9 Jan 2021 17:02:30 +0000 (+0200)
Subject: luci-mod-status: realtime graph - find suffixed libiwinfo.so
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=cb454de3e1ebe8213cae448cd50292f3d843bbd7;p=project%2Fluci.git

luci-mod-status: realtime graph - find suffixed libiwinfo.so

Change the libiwinfo filename handling to match the current
version suffixed .so file.

Copy solution from bc121a5a4

Fixes #4721

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---

diff --git a/modules/luci-mod-status/src/luci-bwc.c b/modules/luci-mod-status/src/luci-bwc.c
index 6f7016ec9d..b7682f9e21 100644
--- a/modules/luci-mod-status/src/luci-bwc.c
+++ b/modules/luci-mod-status/src/luci-bwc.c
@@ -253,7 +253,21 @@ static void umap_file(struct file_map *m)
 
 static void * iw_open(void)
 {
-	return dlopen("/usr/lib/libiwinfo.so", RTLD_LAZY);
+	void *iwlib = NULL;
+	glob_t paths;
+	int i;
+
+	if (glob("/usr/lib/libiwinfo.so*", 0, NULL, &paths) != 0)
+		return NULL;
+
+	for (i = 0; i < paths.gl_pathc && !iwlib; i++)
+		iwlib = dlopen(paths.gl_pathv[i], RTLD_LAZY | RTLD_LOCAL);
+
+	globfree(&paths);
+
+	if (!iwlib)
+		return NULL;
+	return iwlib;
 }
 
 static int iw_update(